mx25pdk: Remove CONFIG_SYS_GENERIC_BOARD

With CONFIG_SYS_GENERIC_BOARD the board hangs after issuing a 'save' command.

Remove CONFIG_SYS_GENERIC_BOARD until this issue can be fixed properly.

Signed-off-by: Fabio Estevam <[email protected]>

vf610: fix build due to missing sys_proto.h

commit 67a04ab3ab8522a3a34491853e46105317580df5
fix the build for MX25. The same error
happens for VF610 SOC.

Signed-off-by: Stefano Babic <[email protected]>

imx: correct HAB status for new chip TO

According to:

http://git.freescale.com/git/cgit.cgi/imx/uboot-imx.git/log/?h=imx_v2009.08_3.0.35_4.1.0

ENGR00287268 mx6: fix the secure boot issue on the new tapout chip
commit 424cb1a79e9f5ae4ede9350dfb5e10dc9680e90b

newer i.MX6 silicon revisions have an updated ROM and HAB API table.
Please see also:

i.MX Applications Processors Documentation
Engineering Bulletins
EB803, i.MX 6Dual/6Quad Applications Processor Silicon Revsion 1.2 to 1.3 Comparison

With this change the secure boot status is correctly displayed

Signed-off-by: Stefano Babic <[email protected]>

mx28evk: Add documentation on how to boot from SPI NOR

Explain the necessary steps in order to boot from SPI NOR.

Based on a earlier submission from Mårten Wikman.

Signed-off-by: Mårten Wikman <[email protected]>
Signed-off-by: Fabio Estevam <[email protected]>

mx28evk: Add a target for SPI NOR boot

Introduce 'mx28evk_spi' target which will store the environment variables
into SPI NOR, which is useful when booting from SPI NOR.

Signed-off-by: Fabio Estevam <[email protected]>

mx28evk: Fix warning when CONFIG_ENV_IS_IN_SPI_FLASH is selected

When building a target with CONFIG_ENV_IS_IN_SPI_FLASH the following
warning is seen:

include/configs/mx28evk.h:73:0: warning: "CONFIG_ENV_SIZE" redefined [enabled by default]

Protect the definition of CONFIG_ENV_SIZE to avoid the warning.

Signed-off-by: Fabio Estevam <[email protected]>

embestmx6boards: Fix the dtb file name for riotboard

The name of the dtb file used in the kernel is 'imx6dl-riotboard.dtb', so fix
it accordingly.

Signed-off-by: Fabio Estevam <[email protected]>
Tested-by: Iain Paton <[email protected]>

embestmx6boards: Fix CONFIG_CONSOLE_DEV

mars and riot boards use UART2 as console, so CONFIG_CONSOLE_DEV should point
to 'ttymxc1' instead.

Signed-off-by: Fabio Estevam <[email protected]>
Tested-by: Iain Paton <[email protected]>

mx6: drop ARM errata 742230

Commit e9fd66defd7e (ARM: mx6: define CONFIG_ARM_ERRATA_742230) enables
errata 742230 for imx6, because it helps remove one reboot issue.
However, this errata does not really apply on imx6, because Cortex-A9
on imx6 is r2p10 while the errata only applies to revisions r1p0..r2p2.

At a later time, commit f71cbfe3ca5d (ARM: Add workaround for Cortex-A9
errata 794072) adds support of errata 794072, which applies to all
Cortex-A9 revisions.  As the workaround for both errata are exactly
same, it makes a lot more sense to select 794072 instead of 742230 for
imx6.  Since we already enable 794072 for imx6, it's time to drop
errata 742230 to avoid confusion.

Signed-off-by: Shawn Guo <[email protected]>
Acked-by: Nitin Garg <[email protected]>

arm: mx5: Enable CONFIG_SYS_GENERIC_BOARD on M53EVK

Signed-off-by: Marek Vasut <[email protected]>

mx6: Fix definition of IOMUXC_GPR12_DEVICE_TYPE_RC

mx6 reference manual incorrectly states that the DEVICE_TYPE field of
IOMUXC_GPR12 register should be configured as '0010' for setting the PCI
controller in RC mode. The correct value should be '0100' instead.

This also aligns with the same value used in the mx6 pci kernel driver.

Signed-off-by: Fabio Estevam <[email protected]>
Acked-by: Marek Vasut <[email protected]>
Acked-by: Stefano Babic <[email protected]>

MX25: fix build due to missing sys_proto.h

THe mx25 arch does not have a sys_proto.h file.
Instead of creating a dummy file, the file
is not included for this SOC.

Signed-off-by: Stefano Babic <[email protected]>

mx25pdk: Add generic board support

Signed-off-by: Fabio Estevam <[email protected]>

imx: sata: return failure if not IMX6Q/IMX6D

The IMX6QUAD/DUAL have SATA, but the IMX6SOLO/DL do not. Return
instead of configuring the SATA clock and GPR13 registers.

Signed-off-by: Tim Harvey <[email protected]>

dwc_ahsata: return failure for MX6 if not IMX6Q/IMX6D

The IMX6QUAD/DUAL have SATA, but the IMX6SOLO/DL do not. Return failure
instead of attempting a memory access that results in a data abort and reset.

Signed-off-by: Tim Harvey <[email protected]>

imx: ventana: switch to SPL

Switch to an SPL image. The SPL for Ventana does the following:
 - setup i2c and read the factory programmed EEPROM to obtain DRAM config
   and model for board-specific calibration data
 - configure DRAM per CPU/size/layout/devices/calibration
 - load u-boot.img from NAND and jump to it

This allows for a single SPL+u-boot.img to replace the previous multiple boa
configurations.

Cc: Stefan Roese <[email protected]>
Cc: Otavio Salvador <[email protected]>
Cc: Andy Ng <[email protected]>
Cc: Eric Nelson <[email protected]>
Cc: Tapani Utriainen <[email protected]>
Cc: Tom Rini <[email protected]>
Signed-off-by: Tim Harvey <[email protected]>

imx: ventana: auto-configure for IMX6Q vs IMX6DL

use the new iomux function and a macros to create a multi-dimensional array
of iomux values without duplicating the defintions.

Cc: Stefan Roese <[email protected]>
Cc: Otavio Salvador <[email protected]>
Cc: Andy Ng <[email protected]>
Cc: Eric Nelson <[email protected]>
Cc: Tapani Utriainen <[email protected]>
Cc: Tom Rini <[email protected]>
Signed-off-by: Tim Harvey <[email protected]>

imx: ventana: split read_eeprom into standalone file

Split the read_eeprom function out so that it can be shared (ie with SPL)

Cc: Stefan Roese <[email protected]>
Cc: Otavio Salvador <[email protected]>
Cc: Andy Ng <[email protected]>
Cc: Eric Nelson <[email protected]>
Cc: Tapani Utriainen <[email protected]>
Cc: Tom Rini <[email protected]>
Signed-off-by: Tim Harvey <[email protected]>

imx: iomux: add macros to setup iomux for multiple SoC types

Allow imx_iomux_v3_setup_multiple_pads to take a multi-cpu pad_list
and add macros for declaring the pad_list that take into account the
SoC types supported using CONFIG_MX6QDL (supports both the MX6Q and MX6DL
iomux).

Cc: Stefan Roese <[email protected]>
Cc: Otavio Salvador <[email protected]>
Cc: Andy Ng <[email protected]>
Cc: Eric Nelson <[email protected]>
Cc: Tapani Utriainen <[email protected]>
Cc: Tom Rini <[email protected]>
Signed-off-by: Tim Harvey <[email protected]>

mx6: add mmdc configuration for MX6Q/MX6DL

- add function for configuring iomux based on board-specific regs
- add function for configuring mmdc based on board-specific and
  chip-specific data

Cc: Stefan Roese <[email protected]>
Cc: Otavio Salvador <[email protected]>
Cc: Andy Ng <[email protected]>
Cc: Eric Nelson <[email protected]>
Cc: Tapani Utriainen <[email protected]>
Cc: Tom Rini <[email protected]>
Signed-off-by: Tim Harvey <[email protected]>

mx6: add structs for mmdc and ddr iomux registers

Add memory-mapped structures for MMDC iomux and configuration. Note that whi
the MMDC configuration registers are common between the IMX6DQ
(IMX6DUAL/IMX6QUAD) and IMX6SDL (IMX6SOLO/IMX6DUALLITE) types the iomux
registers differ. This requires two sets of structures.

Add structures to describe DDR3 device information, system information
(memory layout, etc), and MMDC calibration registers that can be used to
configure the MMDC dynamically.

We define these structures for SPL builds instead of including mx6q-ddr.h an
mx6dl-ddr.h which use the same namespace and are only useful for imximage cf
files.

Cc: Stefan Roese <[email protected]>
Cc: Otavio Salvador <[email protected]>
Cc: Andy Ng <[email protected]>
Cc: Eric Nelson <[email protected]>
Cc: Tapani Utriainen <[email protected]>
Cc: Tom Rini <[email protected]>
Signed-off-by: Tim Harvey <[email protected]>
Acked-by: Nikita Kiryanov <[email protected]>

imx: add comments and remove unused struct fields

Add comment block for the imx_ddr_size function and remove the extra unused
fields from struct esd_mmdc_regs which are also not common between IMX53 and
IMX6.

Cc: Stefan Roese <[email protected]>
Cc: Otavio Salvador <[email protected]>
Cc: Andy Ng <[email protected]>
Cc: Eric Nelson <[email protected]>
Cc: Tapani Utriainen <[email protected]>
Cc: Tom Rini <[email protected]>
Signed-off-by: Tim Harvey <[email protected]>
Acked-by: Stefano Babic <[email protected]>
Acked-by: Nikita Kiryanov <[email protected]>

mx6: add boot device support for SPL

Add a common spl.c file to support boot device functions needed for SPL
such as detecting the boot device.

Cc: Stefan Roese <[email protected]>
Cc: Otavio Salvador <[email protected]>
Cc: Andy Ng <[email protected]>
Cc: Eric Nelson <[email protected]>
Cc: Tapani Utriainen <[email protected]>
Cc: Tom Rini <[email protected]>
Signed-off-by: Tim Harvey <[email protected]>
Acked-by: Nikita Kiryanov <[email protected]>

mx6: add common SPL configuration

Add a common header which can hopefully be shared amon imx6 SPL users

Cc: Stefan Roese <[email protected]>
Cc: Otavio Salvador <[email protected]>
Cc: Andy Ng <[email protected]>
Cc: Eric Nelson <[email protected]>
Cc: Tapani Utriainen <[email protected]>
Cc: Tom Rini <[email protected]>
Signed-off-by: Tim Harvey <[email protected]>
Acked-by: Stefano Babic <[email protected]>
Acked-by: Nikita Kiryanov <[email protected]>

spl: nand: add support for mxs nand

This utilizes existing mxs_nand support layer to provide a method to load an
image off nand for SPL. The flash device will be detected in order to support
multiple flash devices instead of having layout hard coded at build time.

Cc: Stefan Roese <[email protected]>
Cc: Otavio Salvador <[email protected]>
Cc: Andy Ng <[email protected]>
Cc: Eric Nelson <[email protected]>
Cc: Tapani Utriainen <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: Scott Wood <[email protected]>
Signed-off-by: Tim Harvey <[email protected]>

spl: consolidate arch/arm/include/asm/arch-*/spl.h

arch/arm/include/asm/spl.h requires all SoCs to have
arch/arm/include/asm/arch-*/spl.h.

But many of them just define BOOT_DEVICE_* macros.

Those macros are used in the "switch (boot_device) { ... }"
statement in common/spl/spl.c.

So they should not be archtecture specific, but be described as
a simpile enumeration.

This commit merges most of arch/arm/include/asm/arch-*/spl.h
into arch/arm/include/asm/spl.h.

With a little more effort, arch-zynq/spl.h and arch-socfpga/spl.h
will be merged, while I am not sure about OMAP and Exynos.

Signed-off-by: Masahiro Yamada <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: Michal Simek <[email protected]>
Cc: Andreas Bießmann <[email protected]>
Cc: Stephen Warren <[email protected]>
Cc: Tom Warren <[email protected]>
CC: Stefano Babic <[email protected]>
CC: Minkyu Kang <[email protected]>
Cc: Dinh Nguyen <[email protected]>
Acked-by: Andreas Bießmann <[email protected]>
Acked-by: Michal Simek <[email protected]>
Acked-by: Stefano Babic <[email protected]>
Acked-by: Stephen Warren <[email protected]>
Acked-by: Tim Harvey <[email protected]>
Tested-by: Bo Shen <[email protected]> [on sama5d3xek board for at91 part]
Acked-by: Stephen Warren <[email protected]>
Tested-by: Stefano Babic <[email protected]> [applying Tim's i.MX6 patches]
Acked-by: Tom Rini <[email protected]>

serial_mxc: disable new features of autobaud detection

Bit 7 of UCR3 is described in the i.MX3x/i.MX5x/i.MX6x
reference manuals as follows:

Autobaud Detection Not Improved-. Disables new features of
autobaud detection (See Baud Rate Automatic Detection
        Protocol, for more details).

0 Autobaud detection new features selected
1 Keep old autobaud detection mechanism

On at least i.MX6DQ, i.MX6DLS and i.MX53, the "new features"
occasionally cause the receiver to get out of sync and
continuously produce received characters of '\xff'.

This patch disables the "new feature" on all boards, since
there's no support for auto-baud in U-Boot on any of them.

More details are available in this post on i.MX Community:
https://community.freescale.com/message/403254

Signed-off-by: Eric Nelson <[email protected]>
Tested-by: Fabio Estevam <[email protected]>
Acked-by: Stefano Babic <[email protected]>

mx6sabred: Add PFUZE100 PMIC support

mx6sabresd boards have a PFUZE100 PMIC connected to I2C2 bus.

Add support for it

Signed-off-by: Fabio Estevam <[email protected]>

mx6sabreauto: Add the mx6dual-lite variant

Tested by booting a mainline kernel via TFTP.

Signed-off-by: Fabio Estevam <[email protected]>

net/designware: Make DMA burst length configurable and reduce by default

The correct value for this setting can vary across SoCs and boards, so make it
configurable.

Also reduce the default value to 8, which is the same default as used in the
Linux driver.

Signed-off-by: Ian Campbell <[email protected]>
Cc: Alexey Brodkin <[email protected]>

net/designware: reorder struct dw_eth_dev to pack more efficiently.

On Thu, 2014-05-08 at 22:26 +0100, Ian Campbell wrote:
> The {r,t}xbuffs fields also need to be aligned. Previously this was done
> implicitly because they immediately followed the descriptor tables. Make this
> explicit and also move to the head of the struct.

Looks like I managed to not actually commit the move of the field to the
head of the struct! v3.1 follows....

Ian.

8<------------

>From 2937ba01841887317f6792709ed57cb86b5fc0cd Mon Sep 17 00:00:00 2001
From: Ian Campbell <[email protected]>
Date: Thu, 1 May 2014 19:45:15 +0100
Subject: [PATCH] net/designware: reorder struct dw_eth_dev to pack more
 efficiently.

The {tx,rx}_mac_descrtable fields are aligned to ARCH_DMA_MINALIGN, which could
be 256 or even larger. That means there is a potentially huge hole in the
struct before those fields, so move them to the front where they are better
packed.

Moving them to the front also helps ensure that so long as dw_eth_dev is
properly aligned (which it is since "net/designware: ensure device private data
is DMA aligned.") the {tx,rx}_mac_descrtable will be too, or at least avoids
having to worry too much about compiler specifics.

The {r,t}xbuffs fields also need to be aligned. Previously this was done
implicitly because they immediately followed the descriptor tables. Make this
explicit and also move to the head of the struct.

Signed-off-by: Ian Campbell <[email protected]>
Cc: Alexey Brodkin <[email protected]>
Tested-by: Siarhei Siamashka <[email protected]>
Reviewed-by: Siarhei Siamashka <[email protected]>

net/designware: ensure cache invalidations are aligned to ARCH_DMA_MINALIGN

This is required at least on ARM.

When sending instead of simply invalidating the entire descriptor, flush
as little as possible while still respecting ARCH_DMA_MINALIGN, as
requested by Alexey.

Signed-off-by: Ian Campbell <[email protected]>
Cc: Alexey Brodkin <[email protected]>

net/designware: ensure device private data is DMA aligned.

struct dw_eth_dev contains fields which are accessed via DMA, so make sure it
is aligned to a dma boundary. Without this I see:
    ERROR: v7_dcache_inval_range - start address is not aligned - 0x7fb677e0

Signed-off-by: Ian Campbell <[email protected]>
Reviewed-by: Alexey Brodkin <[email protected]>
Acked-by: Marek Vasut <[email protected]>

sunxi: non-FEL SPL boot support for sun7i

Add support for booting from an MMC card.

Signed-off-by: Stefan Roese <[email protected]>
Signed-off-by: Henrik Nordström <[email protected]>
Signed-off-by: Ian Campbell <[email protected]>
Reviewed-by: Marek Vasut <[email protected]>
Cc: Tom Cubie <[email protected]>
Reviewed-by: Tom Rini <[email protected]>

sunxi: mmc support

On Mon, 2014-05-05 at 14:18 +0200, Stefan Roese wrote:
> > + case 1:
> > +#if CONFIG_MMC1_PG

> Are you sure that this is correct and shouldn't be:
>
> +#ifdef CONFIG_MMC1_PG
>
> ?

It's "correct" in so far as it works (the boards.cfg config stuff
#defines things to 1), but I think you are right that it isn't the
preferred style. But...

> A quick scan through this patch series shows that this define
> is not set at all. Perhaps its outdated? Or is it used to support
> some other sunxi SoC? Not sure, perhaps it should be removed for
> now.

...I had thought that it was to support some other board which wasn't
being upstreamed right now, so eventually useful and harmless for now,
but I've just checked and it isn't actually used by any of the boards in
u-boot-sunxi.git. So rather than fix it to use #ifdef lets drop it.
Rather than resend the entire series, here is v5.1 of this patch.

> Other than this please add my:
>
> Reviewed-by: Stefan Roese <[email protected]>

Thanks!

8<---------------------------------

>From 20704e35a41664de5f516ed0e02981ac06085102 Mon Sep 17 00:00:00 2001
From: Ian Campbell <[email protected]>
Date: Fri, 7 Mar 2014 04:29:39 +0000
Subject: [PATCH v5.1 7/8] sunxi: mmc support

This adds support for the MMC controller on the Allwinner A20 (sun7i)
processor.

Signed-off-by: Henrik Nordstrom <[email protected]>
Signed-off-by: Luke Leighton <[email protected]>
Signed-off-by: Oliver Schinagl <[email protected]>
Signed-off-by: Wills Wang <[email protected]>
Signed-off-by: Ian Campbell <[email protected]>
Reviewed-by: Marek Vasut <[email protected]>
Reviewed-by: Stefan Roese <[email protected]>
Cc: Tom Cubie <[email protected]>
Cc: Aaron Maoye <[email protected]>
Cc: Pantelis Antoniou <[email protected]>
Reviewed-by: Tom Rini <[email protected]>

sunxi: add gmac Ethernet support

Add support for the GMAC Ethernet controller on Allwinner A20 (sun7i)
processors. Enable for the Cubietruck.

Signed-off-by: Chen-Yu Tsai <[email protected]>
Signed-off-by: Jens Kuske <[email protected]>
Signed-off-by: Ian Campbell <[email protected]>
Reviewed-by: Marek Vasut <[email protected]>
Reviewed-by: Tom Rini <[email protected]>

sunxi: add support for Cubietruck booting in FEL mode

Signed-off-by: Oliver Schinagl <[email protected]>
Signed-off-by: Jens Kuske <[email protected]>
Signed-off-by: Ian Campbell <[email protected]>
Reviewed-by: Tom Rini <[email protected]>
Reviewed-by: Marek Vasut <[email protected]>

sunxi: add sun7i cpu, board and start of day support

This patch adds generic board, start of day and basic build system support for
the Allwinner A20 (sun7i) processor. This code will not been compiled until the
build is hooked up in a later patch. It has been split out to keep the patches
manageable.

Signed-off-by: Adam Sampson <[email protected]>
Signed-off-by: Aleksei Mamlin <[email protected]>
Signed-off-by: Alexandru Gagniuc <[email protected]>
Signed-off-by: Chen-Yu Tsai <[email protected]>
Signed-off-by: Emilio López <[email protected]>
Signed-off-by: Hans de Goede <[email protected]>
Signed-off-by: Henrik Nordstrom <[email protected]>
Signed-off-by: Jens Kuske <[email protected]>
Signed-off-by: Luc Verhaegen <[email protected]>
Signed-off-by: Luke Leighton <[email protected]>
Signed-off-by: Oliver Schinagl <[email protected]>
Signed-off-by: Patrick Wood <[email protected]>
Signed-off-by: Stefan Roese <[email protected]>
Signed-off-by: Wills Wang <[email protected]>
Signed-off-by: Ian Campbell <[email protected]>
Reviewed-by: Marek Vasut <[email protected]>
Cc: Tom Cubie <[email protected]>
Reviewed-by: Tom Rini <[email protected]>

sunxi: add sun7i dram setup support

This patch adds DRAM initialisation support for the Allwinner A20 (sun7i)
processor. This code will not been compiled until the build is hooked up in a
later patch. It has been split out to keep the patches manageable.

Signed-off-by: Alexandru Gagniuc <[email protected]>
Signed-off-by: Emilio López <[email protected]>
Signed-off-by: Hans de Goede <[email protected]>
Signed-off-by: Henrik Nordstrom <[email protected]>
Signed-off-by: Jens Kuske <[email protected]>
Signed-off-by: Luke Leighton <[email protected]>
Signed-off-by: Oliver Schinagl <[email protected]>
Signed-off-by: Siarhei Siamashka <[email protected]>
Signed-off-by: Stefan Roese <[email protected]>
Signed-off-by: Ian Campbell <[email protected]>
Reviewed-by: Marek Vasut <[email protected]>
Cc: Tom Cubie <[email protected]>
Reviewed-by: Tom Rini <[email protected]>

sunxi: add sun7i pinmux and gpio support

This patch adds the basic pinmux and gpio support for the Allwinner A20 (sun7i)
processor. This code will not been compiled until the build is hooked up in a
later patch. It has been split out to keep the patches manageable.

Signed-off-by: Chen-Yu Tsai <[email protected]>
Signed-off-by: Hans de Goede <[email protected]>
Signed-off-by: Ma Haijun <[email protected]>
Signed-off-by: Oliver Schinagl <[email protected]>
Signed-off-by: Henrik Nordström <[email protected]>
Signed-off-by: Ian Campbell <[email protected]>
Reviewed-by: Tom Rini <[email protected]>
Acked-by: Marek Vasut <[email protected]>
Cc: Stefan Roese <[email protected]>
Cc: Tom Cubie <[email protected]>
Reviewed-by: Tom Rini <[email protected]>

sunxi: add sun7i clocks and timer support.

This patch adds the basic clocks and timer support for the Allwinner A20
(sun7i) processor. This code will not been compiled until the build is hooked
up in a later patch. It has been split out to keep the patches manageable.

Some of the code here is common to multiple sunxi subarchtectures, hence files
are named sun4i which is the earliest similar variant.

Signed-off-by: Alexandru Gagniuc <[email protected]>
Signed-off-by: Chen-Yu Tsai <[email protected]>
Signed-off-by: Emilio López <[email protected]>
Signed-off-by: Hans de Goede <[email protected]>
Signed-off-by: Henrik Nordstrom <[email protected]>
Signed-off-by: Jens Kuske <[email protected]>
Signed-off-by: Luke Leighton <[email protected]>
Signed-off-by: Oliver Schinagl <[email protected]>
Signed-off-by: Ian Campbell <[email protected]>
Cc: Stefan Roese <[email protected]>
Cc: Tom Cubie <[email protected]>
Reviewed-by: Tom Rini <[email protected]>

boards.cfg: update highbank maintainer email

My Calxeda email is gone, so update my email address.

Signed-off-by: Rob Herring <[email protected]>

arm: vf610: add DDR_SEL_PAD_CONTR register

Set DDR_SEL_PAD_CONTR register explicitly to DDR3 which solves RAM
issues with newer silicon (1.1). This register was added in revision
4 of the Vybrid Reference Manual.

Signed-off-by: Stefan Agner <[email protected]>

Arm64 fix a bug of vbar_el3 initialization

Signed-off-by: David Feng <[email protected]>

ARM: highbank: convert to generic board

Enable CONFIG_SYS_GENERIC_BOARD on highbank.

Signed-off-by: Rob Herring <[email protected]>

lsxl: rework boot scripts

Move addresses for kernel, ramdisk and fdt blob to own variables. Add dtb
blob loading to all existing boot scripts, dtb filenames were taken from
vanilla kernel. Introduce new boot script bootcmd_legacy, which only loads
a kernel and a ramdisk. Make this the default boot script. This should also
restore the behaviour of the original bootloader.

Cc: Prafulla Wadaskar <[email protected]>
Cc: Tom Rini <[email protected]>
Signed-off-by: Michael Walle <[email protected]>

lsxl: use 64bit for LBA48 to support 4 TB drives

Cc: Prafulla Wadaskar <[email protected]>
Signed-off-by: Michael Walle <[email protected]>

Merge branch 'master' of git://git.denx.de/u-boot-arm

Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

compulab: eeprom: enable any i2c driver

Make the common eeprom library available for any I2C driver.

Signed-off-by: Ilya Ledvich <[email protected]>
Signed-off-by: Igor Grinberg <[email protected]>

cm-t54: add environment partition runtime detection

Add environment partition runtime detection callback.

Signed-off-by: Dmitry Lifshitz <[email protected]>
Acked-by: Igor Grinberg <[email protected]>

cm-t54: add EEPROM support and MAC address handling

cm-t54 Eth MAC address is stored in onboard EEPROM.
Add EEPROM support and setup stored Eth MAC address.

If EEPROM does not contain a valid MAC, then generate it from the
processor ID code (reference code is taken from OMAP5 uEvm board file).

Modify Device Tree blob MAC address field with retrieved data.

Signed-off-by: Dmitry Lifshitz <[email protected]>
Acked-by: Igor Grinberg <[email protected]>

cm-t54: add cm-t54 board support

Add cm-t54 board directory, config file. Enable build.

Basic support includes:

Serial console
SD/MMC
eMMC
USB
Ethernet

Signed-off-by: Dmitry Lifshitz <[email protected]>
Acked-by: Igor Grinberg <[email protected]>

am33xx: report silicon revision instead of code

As revision code 1 is for silicon revision 2.0, it is easily confused with
silicon revision 1.0.

Device type report also reworked in same style.

Signed-off-by: Sergey Alyoshin <[email protected]>

ARM: OMAP: Fix omap_sdram_size calculation

Last section of DMM is used for trapping tiler unmapped sections.
Corresponding trap_size should be deducted from total SDRAM size
only if trap section is overlapping with available SDRAM
based on DMM sections. Fixing the same.

Signed-off-by: Lokesh Vutla <[email protected]>

arm, am33xx: Enable CONFIG_SYS_GENERIC_BOARD for siemens boards

Signed-off-by: Heiko Schocher <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: Samuel Egli <[email protected]>
Cc: Roger Meier <[email protected]>
Tested-by: Samuel Egli <[email protected]>

omap4: duovero: Add Gumstix DuoVero machine.

This adds the Gumstix DuoVero machine [1].  This is a OMAP4430-based
computer-on-module (COM aka SOM) that can be mounted on various
expansion boards with different peripherals.

[1] https://store.gumstix.com/index.php/category/43/

Signed-off-by: Ash Charles <[email protected]>
[trini: Rename gpmc_enable_gpmc_cs_config to gpmc_enable_gpmc_net_config]
Signed-off-by: Tom Rini <[email protected]>

armv7:TI: Add <asm/ti-common/sys_proto.h> and migrate omap_hw_init_context

The omap_hw_init_context function (and assorted helpers) is the same for
all OMAP-derived parts as when CHSETTINGS are used, that's the same and
our DDR base is also always the same.  In order to make this common we
simply need to update the names of the define for DDR address space
which is also common.

Cc: Sricharan R. <[email protected]>
Cc: Lokesh Vutla <[email protected]>
Signed-off-by: Tom Rini <[email protected]>
Reviewed-by: Lokesh Vutla <[email protected]>

compulab: eeprom: add default eeprom address

Add default eeprom address setting.

Signed-off-by: Igor Grinberg <[email protected]>

ARM: DRA7xx: ctrl: Fix efuse register addresses

Efuse register addresses are wrongly programmed.
Fixing the same.

Signed-off-by: Lokesh Vutla <[email protected]>
Acked-by: Tom Rini <[email protected]>

ARM: DRA72x: Update EMIF data

DRA72 has 1GB connected to EMIF1 only. Updating the details.
And also enable WA for BUG0039 only if corresponding EMIF is present.

Signed-off-by: Lokesh Vutla <[email protected]>
Acked-by: Tom Rini <[email protected]>

ARM: DRA72x: clocks: Update the hwdata

Adding the prcm, dplls, control module hooks for DRA72x.

Signed-off-by: Lokesh Vutla <[email protected]>
Acked-by: Tom Rini <[email protected]>

ARM: DRA72x: volt: Update the pmic offsets

TPS65917 is used in DRA722 evm. Update the address offsets accordingly.

Signed-off-by: Lokesh Vutla <[email protected]>
Signed-off-by: Keerthy <[email protected]>
Acked-by: Tom Rini <[email protected]>

ARM: DRA72x: Add Silicon ID support

Add silicon ID code for DRA722 silicon.

Signed-off-by: Lokesh Vutla <[email protected]>
Acked-by: Tom Rini <[email protected]>

ARM: omap: merge GPMC initialization code for all platform

GPMC controller on TI's OMAP SoC is general purpose controller to interface
with different types of external devices like;
 - parallel NOR flash
 - parallel NAND flash
 - OneNand flash
 - SDR RAM
 - Ethernet Devices like LAN9220

Though GPMC configurations may be different for each platform depending on
clock-frequency and external device interfacing with controller. But
initialization sequence remains common across all platfoms.

Thus this patch merges gpmc_init() scattered in different arch-xx/mem.c
files into single omap-common/mem-common.c

However, actual platforms specific register config values are still sourced
from corresponding platform specific headers like;
 AM33xx: arch/arm/include/asm/arch-am33xx/mem.h
 OMAP3:  arch/arm/include/asm/arch-omap3/mem.h
 OMAP4:  arch/arm/include/asm/arch-omap4/mem.h
 OMAP4:  arch/arm/include/asm/arch-omap5/mem.h

Also, CONFIG_xx passed by board-profile decide config for which set of macros
need to be used for initialization
 CONFIG_NAND:    initialize GPMC for NAND device
 CONFIG_NOR:     initialize GPMC for NOR device
 CONFIG_ONENAND: initialize GPMC for ONENAND device

Signed-off-by: Pekon Gupta <[email protected]>
[trini: define GPMC_SIZE_256M for omap3]
Signed-off-by: Tom Rini <[email protected]>

examples: select libgcc for non-default architecture

In case of multilib-enabled toolchains if default architecture differ from
the one examples are being built for linker will fail to link example object
files with libgcc of another (non-compatible) architecture.

Interesting enough for years in main Makefile we used CFLAGS/c_flags for this
but not for examples.

So fixing it now.

Signed-off-by: Alexey Brodkin <[email protected]>
Cc: Masahiro Yamada <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: Wolfgang Denx <[email protected]>
Acked-by: WOlfgang Denk <[email protected]>
Acked-by: Masahiro Yamada <[email protected]>

doc:git-mailrc: Add entry for dfu subsystem

Entry for dfu subsystem have been added to doc/git-mailrc file

Signed-off-by: Lukasz Majewski <[email protected]>

Add myself as maintainer for chromebook-x86

This is currently the only x86 board.

Signed-off-by: Simon Glass <[email protected]>

Merge branch 'u-boot-sh/rmobile' into 'u-boot-arm/master'

Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'

ARM: omap5: add platform specific info for GPMC and ELM controllers

This patch moves platform specific information for GPMC and ELM controller
into separate header files, so that any derivative devices do not mess other
header files.

Platform specific information added into arch-xx/../hardware.h
 - CPU related platform specific details like base-address of GPMC and ELM

Platform specific information added into arch-xx/../mem.h
 - Generic configs for GPMC and ELM initialization.
 - Hardware parameters or constrains specific to GPMC and ELM IP like;
   number of max number of chip-selects available

Signed-off-by: Pekon Gupta <[email protected]>

ARM: omap4: add platform specific info for GPMC and ELM controllers

This patch moves platform specific information for GPMC and ELM controller
into separate header files, so that any derivative devices do not mess other
header files.

Platform specific information added into arch-xx/../hardware.h
 - CPU related platform specific details like base-address of GPMC and ELM

Platform specific information added into arch-xx/../mem.h
 - Generic configs for GPMC and ELM initialization.
 - Hardware parameters or constrains specific to GPMC and ELM IP like;
   number of max number of chip-selects available

Signed-off-by: Pekon Gupta <[email protected]>

omap3: overo: Use common configurations for Overo

Clean-up the board configuration file for the Gumstix Overo board by
including common omap3 definitions from ti_omap3_common.h as suggested
here [1].

[1] http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/185960

Signed-off-by: Ash Charles <[email protected]>
Conflicts:
include/configs/omap3_overo.h

Allow overo to boot with device tree

Update the board configuration for Gumstix Overo. In particular,
add support for zImage and DTB files on boot.

Signed-off-by: Ash Charles <[email protected]>

OMAP3: overo: add some Gumstix expansion boards

Add EEPROM ID switches for Alto35, Arbor43C, Stagecoach, Thumbo, and
Turtlecore Gumstix Overo expansion boards.

Signed-off-by: Ash Charles <[email protected]>

Add Board Revision for Wireless chip

Gumstix Overo COMs with board revision 0x4 use a different Wifi and
Bluetooth module: Wi2Wi's W2CBW0015.  No other code changes are required
in u-boot---just handling of this particular board revision.

Signed-off-by: Ash Charles <[email protected]>

arm: omap3: Fix omap3_overo SPL boot hangup

Patch f33b9bd3
[arm: omap3: Enable clocks for peripherals only if they are used]
breaks SPL booting on Overo. Since some gpio inputs are
read to detect the board revision. But with this patch above, the
clocks to the GPIO subsystems are not enabled per default any more.
The GPIO banks need to be configured specifically now.

Signed-off-by: Ash Charles <[email protected]>

OMAP3: overo: eliminate hard-coded partition offsets

The linux kernel is at nand0,3 using the current layout, but is best
accessed through the partition label "linux".  Since CONFIG_CMD_MTDPARTS is
defined the CONFIG_JFFS2 settings are unreferenced; use "setenv partition
rootfs" to set the default mtd partition for jffs2.

Signed-off-by: Peter A. Bigot <[email protected]>
Tested-by: Ash Charles <[email protected]>

OMAP3: overo: increase linux partition to 8 MiB

Linux kernel at version 3.5 is about 3.5 MiB; test kernels for 3.10 exceed 4
MiB.  Prepare for future upgrades by increasing the NAND partition now.

Signed-off-by: Peter A. Bigot <[email protected]>
Tested-by: Ash Charles <[email protected]>

OMAP3: overo: add command support for mtd and ubi

The NAND linux partition format default was changed from jffs2 to ubi in
254973e6df0e48f1a72b67905185c774dcd9f394 but the corresponding commands were
not enabled.

Signed-off-by: Peter A. Bigot <[email protected]>
Tested-by: Ash Charles <[email protected]>

omap: overo: allow the use of a plain text env file instead boot scripts

Adapted from d70f5480 described below.

    commit d70f54808dfa83b574e1239c3eccbcf3317343e1
    Author: Javier Martinez Canillas <[email protected]>
    Date:   Mon Jan 7 03:51:20 2013 +0000

    omap4: allow the use of a plain text env file instead boot scripts

    For production systems it is better to use script images since
    they are protected by checksums and carry valuable information like
    name and timestamp. Also, you can't validate the content passed to
    env import.

    But for development, it is easier to use the env import command and
    plain text files instead of script-images.

    Since both OMAP4 supported boards (Panda and TI SDP4430) are used
    primarily for development, this patch allows U-Boot to load env var
    from a text file in case that an boot.scr script-image is not present.

    The variable uenvcmd (if existent) will be executed (using run) after
    uEnv.txt was loaded. If uenvcmd doesn't exist the default boot sequence
    will be started.

Signed-off-by: Javier Martinez Canillas <[email protected]>
Acked-by: Nishanth Menon <[email protected]>
Signed-off-by: Peter A. Bigot <[email protected]>
Tested-by: Ash Charles <[email protected]>

esdhc/usdhc: Fix warning when CONFIG_SYS_FSL_ESDHC_USE_PIO is not set

In 7168977 we made calls to check_and_invalidate_dcache_range()
conditional on !CONFIG_SYS_FSL_ESDHC_USE_PIO.  Only define this function
in this case as well.

Signed-off-by: Tom Rini <[email protected]>

Merge branch 'master' of git://git.denx.de/u-boot-mmc

cmd_mmc: use new mmc_select_hwpart() function

The implementation of mmc_select_hwpart() was cribbed from do_mmcops().
Update do_mmcops() to call mmc_select_hwpart() to avoid duplication.

<panto> Manual patch update due to patch order.

Acked-by: Pantelis Antoniou <[email protected]>
Signed-off-by: Stephen Warren <[email protected]>

mmc: provide a select_hwpart implementation for get_device()

This enables specifying which eMMC HW partition to target for any U-Boot
command that uses the generic get_partition() function to parse its
command-line arguments.

Acked-by: Pantelis Antoniou <[email protected]>
Signed-off-by: Stephen Warren <[email protected]>

disk: support devices with HW partitions

Some device types (e.g. eMMC) have hardware-level partitions (for eMMC,
separate boot and user data partitions). This change allows the user to
specify the HW partition they wish to access when passing a device ID to
U-Boot Commands such as part, ls, load, ums, etc.

The syntax allows an optional ".$hwpartid" to be appended to the device
name string for those commands.

Existing syntax, for MMC device 0, default HW partition ID, SW partition
ID 1:

ls mmc 0:1 /

New syntax, for MMC device 0, HW partition ID 1 (boot0), SW partition
ID 2:

ls mmc 0.1:2 /

For my purposes, this is most useful for the ums (USB mass storage
gadget) command, but there's no reason not to allow the new syntax
globally.

This patch adds the core support infra-structure. The next patch will
provide the implementation for MMC.

Acked-by: Pantelis Antoniou <[email protected]>
Signed-off-by: Stephen Warren <[email protected]>

cmd_part: fix typo in part command help text

All the sub-commands start with the main command name, but it was
missing from one of the help texts.

<panto> typos fix.

Signed-off-by: Stephen Warren <[email protected]>
Acked-by: Tom Rini <[email protected]>
Acked-by: Pantelis Antoniou <[email protected]>

eMMC: cmd_mmc.c adds the 'rpmb' sub-command for the 'mmc' command

This sub-command adds support for the RPMB partition of an eMMC:
* mmc rpmb key <address of the authentication key>
  Programs the authentication key in the eMMC This key can not
  be overwritten.
* mmc rpmb read <address> <block> <#count> [address of key]
  Reads <#count> blocks of 256 bytes in the RPMB partition
  beginning at block number <block>. If the optionnal
  address of the authentication key is provided, the
  Message Authentication Code (MAC) is verified on each
  block.
* mmc rpmb write <address> <block> <#count> <address of key>
  Writes <#count> blocks of 256 bytes in the RPMB partition
  beginning at block number <block>. The datas are signed
  with the key provided.
* mmc rpmb counter
  Returns the 'Write counter' of the RPMB partition.

The sub-command is conditional on compilation flag CONFIG_SUPPORT_EMMC_RPMB

Acked-by: Pantelis Antoniou <[email protected]>
Signed-off-by: Pierre Aubert <[email protected]>
CC: Wolfgang Denk <[email protected]>

Add the function 'confirm_yesno' for interactive

User's confirmation is asked in different commands. This commit adds a
function for such confirmation.

Acked-by: Pantelis Antoniou <[email protected]>
Signed-off-by: Pierre Aubert <[email protected]>

eMMC: add support for operations in RPMB partition

This patch adds functions for read, write and authentication
key programming for the Replay Protected Memory Block partition
in the eMMC.

Acked-by: Pantelis Antoniou <[email protected]>
Signed-off-by: Pierre Aubert <[email protected]>

mmc: Handle switch error status bit in MMC card status

MMC switch command for unsupported feature (e.g. bus width) sets a switch
error bit in card status. This bit should be checked, and, if it's set,
no access with new controller settings should be performed.

Acked-by: Pantelis Antoniou <[email protected]>
Signed-off-by: Andrew Gabbasov <[email protected]>

mmc: postponed needless timer initialization

mmc_init() doesn't call get_timer() anymore if MMC is already
initialized.

<panto> Minor formatting fix.

Acked-by: Pantelis Antoniou <[email protected]>
Signed-off-by: Mateusz Zalega <[email protected]>

Add board_mmc_init(...) function for init mmc1 only

Since B&R boards uses only MMC-Controller #1, it only
wastes time if we initialize #0 first to see that there is nothing.

Cc: <[email protected]>
Acked-by: Pantelis Antoniou <[email protected]>
Signed-off-by: Hannes Petermaier <[email protected]>

Merge branch 'fpga' of git://denx.de/git/u-boot-microblaze

Merge branch 'master' of git://git.denx.de/u-boot-arm

Merge branch 'pr-15052014' of git://git.denx.de/u-boot-usb

Merge branch 'master' of git://git.denx.de/u-boot-usb

esdhc/usdhc: Fix PIO mode bug in fsl_esdhc driver

When configure the fsl_esdhc driver to PIO mode by defining
"CONFIG_SYS_FSL_ESDHC_USE_PIO", the SD/MMC read and write will fail.

Two bugs in the driver to cause the issue:
1. The read buffer was invalidated after reading from DATAPORT register,
which should be only applied to DMA mode. The valid data in cache was
overwritten by physical memory.
2. The watermarks are not set in PIO mode, will cause according state not
be set.

Acked-by: Pantelis Antoniou <[email protected]>
Signed-off-by: Ye.Li <[email protected]>

arm: rmobile: lager: Enable CONFIG_SYS_GENERIC_BOARD

Add CONFIG_SYS_GENERIC_BOARD to use common/board_*.c for lager.

Signed-off-by: Nobuhiro Iwamatsu <[email protected]>

arm: rmobile: koelsch: Enable CONFIG_SYS_GENERIC_BOARD

Add CONFIG_SYS_GENERIC_BOARD to use common/board_*.c for koelsch.

Signed-off-by: Nobuhiro Iwamatsu <[email protected]>